From: Julien Grall Date: Wed, 14 Jan 2015 18:00:43 +0000 (+0000) Subject: xen/arm: Blacklist the memory mapped timer (armv7-timer-mem) X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3924 X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22Dat/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22Dat?a=commitdiff_plain;h=770ca104b5bb4dd3fee4071e2d8f1133f3c6d134;p=xen.git xen/arm: Blacklist the memory mapped timer (armv7-timer-mem) Some platform (such as the VFP Base AEMv8 model) has a memory mapped timer. We don't want DOM0 use this timer rather than the generic ARM timer. So blacklist it for all platforms. Signed-off-by: Julien Grall Acked-by: Ian Campbell --- diff --git a/xen/arch/arm/domain_build.c b/xen/arch/arm/domain_build.c index c33a73c63e..c2dcb4937f 100644 --- a/xen/arch/arm/domain_build.c +++ b/xen/arch/arm/domain_build.c @@ -1031,6 +1031,8 @@ static int handle_node(struct domain *d, struct kernel_info *kinfo, DT_MATCH_COMPATIBLE("arm,psci"), DT_MATCH_PATH("/cpus"), DT_MATCH_TYPE("memory"), + /* The memory mapped timer is not supported by Xen. */ + DT_MATCH_COMPATIBLE("arm,armv7-timer-mem"), { /* sentinel */ }, }; static const struct dt_device_match gic_matches[] __initconst =